Fix error type for third invalid PIN entry #60
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
daringer
approved these changes
Feb 19, 2024
sosthene-nitrokey
approved these changes
Feb 20, 2024
| if self.state.persistent.pin_blocked() { | ||
| return Err(Error::PinAuthBlocked); | ||
| } | ||
| self.state.pin_blocked()?; |
There was a problem hiding this comment.
Having 3 methods in state.rs called pin_blocked is confusing. Makes me wish for jump to definition in code review
There was a problem hiding this comment.
was confused by the very same and had to look it up manually - but still makes sense as it is I guess
If the user provides a wrong PIN and the persistent or per-boot PIN retry counter reaches its limit, we have to return the PinBlocked (persistent) or PinAuthBlocked (per boot) error code instead of PinInvalid. The previous implementation checked the persistent retry counter twice instead of checking both counters. This patch fixes this problem by using the combined State::pin_blocked method instead of manually checking the persistent and runtime state directly. It also replaces a raw subtraction when computing the remaining retries with a saturating sub, just to be sure.
robin-nitrokey
force-pushed
the
auth-blocked
branch
from
f3cd5ab
to
6e9fa17
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If the user provides a wrong PIN and the persistent or per-boot PIN retry counter reaches its limit, we have to return the PinBlocked (persistent) or PinAuthBlocked (per boot) error code instead of PinInvalid. The previous implementation checked the persistent retry counter twice instead of checking both counters.
This patch fixes this problem by using the combined State::pin_blocked method instead of manually checking the persistent and runtime state directly.
It also replaces a raw subtraction when computing the remaining retries with a saturating sub, just to be sure.